Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:57:03 +0000 (07:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:57:03 +0000 (07:57 -0700)

Trivial merge